Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Tue, 25 May 2010 11:10:15 +0000 (11:10 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Tue, 25 May 2010 11:10:15 +0000 (11:10 +0000)

Trivial merge